<!DOCTYPE html>

<html lang="en">

<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>首页</title>
</head>

<body>
<<<<<<< HEAD
    <h1>登录功能结束，修改了登录功能</h1>
=======
    <h1>注册功能已经完成了</h1>
>>>>>>> register
</body>

</html>